From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 21 Jun 2011 14:45:53 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~37
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f630d689e29adb26e2c3bcf3ada28e776373ee79;p=emacs.git

Merge from trunk.
---

f630d689e29adb26e2c3bcf3ada28e776373ee79